[MSDOS]: Don't include files from the dos extender

and debugger.  Use the <coff.h> that was put in the right place
a couple of djgpp versions ago.  Consequently, use `unsigned short'
for `word16' and `unsigned long' for `word32'.

diff --git a/src/unexec.c b/src/unexec.c
index 3cb2941be05dc4e2e690d451b085c4edc4459d3a..3bc147fec47e6b4008f69a4bcfa8cdfec257ce69 100644 (file)
--- a/src/unexec.c
+++ b/src/unexec.c
@@ -177,8 +177,7 @@ int need_coff_header = 1;
 #include <coff-encap/a.out.encap.h> /* The location might be a poor assumption */
 #else
 #ifdef MSDOS
-#include <../go32/gotypes.h>
-#include <../go32/ed/coff.h>
+#include <coff.h>
 #define filehdr external_filehdr
 #define scnhdr external_scnhdr
 #define syment external_syment
@@ -187,14 +186,14 @@ int need_coff_header = 1;
 #define n_type e_type
 struct aouthdr
 {
-  word16       magic;          /* type of file                         */
-  word16       vstamp;         /* version stamp                        */
-  word32       tsize;          /* text size in bytes, padded to FW bdry*/
-  word32       dsize;          /* initialized data "  "                */
-  word32       bsize;          /* uninitialized data "   "             */
-  word32       entry;          /* entry pt.                            */
-  word32       text_start;     /* base of text used for this file */
-  word32       data_start;     /* base of data used for this file */
+  unsigned short       magic;  /* type of file                         */
+  unsigned short       vstamp; /* version stamp                        */
+  unsigned long                tsize;  /* text size in bytes, padded to FW bdry*/
+  unsigned long                dsize;  /* initialized data "  "                */
+  unsigned long                bsize;  /* uninitialized data "   "             */
+  unsigned long                entry;  /* entry pt.                            */
+  unsigned long                text_start;/* base of text used for this file */
+  unsigned long                data_start;/* base of data used for this file */
 };